Tidied a few things up.