Cleaned code and made a couple small improvements to the on-screen data