Cleaning Up Code

Getting ready for a hacky mobile solution