Clean code up.
Merge pull request #3 from gergoerdosi/cleanup

Clean code up