Beginning to clean up my code
Commit