Merge pull request #166 from acmetech/master

Code consistency/style
remove some whitespace