refactoring wuensche