Cleanup code style for public
Merge branch 'master' into ct/remove_compass