Clean up some code
Merge pull request #1 from rylev/cleanup

Some Suggestions for Cleaner Code