Class formatting cleanup