refactoring: make class