Uebung in refactoring