maintenance work

tidied up a number of files