cleaned up code
Merge pull request #1 from acolby/master

cleaned up code