Cleaned up code
Merge pull request #20 from b91961/master

Cleaned up code