Small class redesign