more manual refactoring