Refactor: more cleanup