Minor tidying up of code.