Whitespace fixes
API CHANGE! Use camelcase