I could but I tried not to change things unrelated to this PR's scope ... 
Just to prevent me from optimizing aesthetics or whatever. I'll change it if you feel strongly about it ;-)