Final check-in

Clean up code a little bit to fit on screen.
This should be the final commit for now.