Ran classes through formatter - no functional changes.