refactor, camelcase