Refactoring - class names start with uppercase letter.