Clean up the code
Merge pull request #1 from hekike/master

Clean up the code