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

cleaned up code