Stylistic change
Reorder methods to make sense