Cleanup, camelCase plz