Some changes to tidy up.