Design-problem: Cleaned up code.