Tidied up various things: