Tidied some things...