Reorder methods for readability