Misc Cleanup

I had some changes that slipped through the cracks on previous pull requests.

The 4 commits should be pretty self-explanatory