Split classes slightly