Remo refactoring