Code cleanup
Merge pull request #16 from mvala/master

Code cleanup