Formatting fixes on Class 2