Emne: refactoring