Code clean up, reformat code, no code changes
Resolved merge conflicts from pull request #10 from tmbtech/master
Merge branch 'tmbtech-master'