Method ordering refactor