Tidied up various items.