Class rework and simplification