capturing thoughts on more refactoring