Reorder some methods for better source code readibility.