Minor readablity improvements
Minor tidying up.