Neaten, reduce unneeded verbosity