Update some stuff

Clean up code
Work on modularizing the program