Tidied some things up