Shorten classes that are too long