Refactor some more methods