Clean up and switch to camelCase