Reorder methods for more sense