refactoring to camelCase