Tidied things up a bit.