#9

working on making the code cleaner