Formatting fixes and cleanup
Merge branch 'master' of https://github.com/alexschiller/rosf