Finishing class refactoring