Code cleanup
Merge pull request #3 from vicb/round-2

Code cleanup