minor style tweeks
adds a load of stuff
removes a file