A bit cleaner now...

[See changes]