Class formatting ready for testing.