various cs fixes and clean up
Merge pull request #12 from cordoval/cleanup

various cs fixes and clean up