Rearranged methods for better readability.