Code clean up, reformat code, no code changes

Fixes #9