refactoring in geppetto