- Updated class formatting