Tidy up whitespace and left over nils on label fields