Fix coding standard issues

Messed up the #1328 :cry: so submitted as new patch!
Why is this deleting blocks of code?