Refactor

change to camelCase