[CLEANUP] Reorder the methods

Make the order of the methods more logical to read from top to bottom.

Closes #138