Pequeo refactoring