tidy up spacing and remove superfluous stuff