Neaten up for general use.