tidy up bits and pieces