more refactoring notes