Various tidy up