minor tidy up