Code-refactoring