A few minor changes
Minor tidying