Output cleaning - my OCD is taking over...