piccolo refactoring