refactor => proper case