Cleanup of code. Fixed a lot of layout and code nits that didn't change functionality.