Consistent usage of parseInt and other minor clean up
Whitespace cleanup
Merge pull request #7 from amire80/cleanup

Cleanup