Some class refactoring