tidy up slightly