code cleanup! mostly if spacing and comment cleanup
Merge pull request #2 from sabhiram/code-cleanup

code cleanup! mostly if spacing and comment cleanup
sync with master