Fixed class formatting