Remco refactoring