basic tidy up