Simplify the class definition