Reorder methods and functions for improved readability.