Rearranged methods into a more logical order