Minor tidying of code.