Tidied up versions ready for adding Scalaz