Clean up to camelcase