Small class refactor