Refactoring plus incomplete sketch other way around