Code tidied up.