Added proper formatting to most classes.