Clean up code and add auto scroll to top

These formatting are just a waste of screen real estate and whitespace