Clean up the code a bit
Merge pull request #17 from mknudsen01/clean-up-code

Clean up the code a bit