refactoring session juv and jones