Ronja refactoring