I can safely reenable this cop now
Tidy up a bit