Compo: refactoring