Merge pull request #74 from js850/cleanup_style

cleanup a bunch of files
more cleanup work