Improvements

I'm completely OCD.