reorder class contents according to style guide