refactoring class and val names