Code cleanup
Merge pull request #22 from Sunrise21/master

Code cleanup