Cleaned up my code to make it more readable
Resolves merge conflicts
Merge pull request #2 from markableidinger/newb

Cleaned up my code to make it more readable