Usability fixes and code cleanup

[chrisgraham]

You may want to cherry-pick this, as I did some automated code cleanup and manual code cleanup too -- and I see you have another pull request making bigger changes. I think the usability fixes are important though.