piccolo refactor