cleaning up stuff
Merge pull request #4 from danielqo/master

Code cleanup