[CLEANUP] Reorder the methods

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

Closes #138
Merge pull request #142 from jjriv/cleanup/reorder-methods

[CLEANUP] Reorder the methods