Better formatting
Fix safe-but-fussy code