Class assignment formatting and other code cleanup