Tidy up bits and pieces