initial tidy up - more to come ...