Minor tidy up.
Minor clean up.