#4: Refactorings of the smelly code.