Refactor order of methods.