Fix class formatting