Class tweaks

Adjusted formatting on several classes.