proper name casing
refactoring