Pexeso: refactoring.