Simplify classes