Note 542

Christian Kruse

Refactoring code thrown together in a hurry is not fun at all…