Improve readability by moving some methods around.