cleaned up code
Merge pull request #8 from cmarkel5/code_cleanup

cleaned up code