Fix auditing issues

Sorry, my fault - I missed the final audit run (I did a lot of reformatting before).
- replace unless ... with if ...
- remove trailing whitespace which shouldn't have been there in the first place..