A little tidying up to follow my preferred style.