Split classes by returns too