Refactoring nemo