code format/clean up
Merge pull request #363 from JFreegman/master

code format/clean up