cleans up code
Merge pull request #80 from coreyd303/cleanup

cleans up code