Somre refactoring