Minor tidy up.