Some general code tidy-up and description update.