Small tidy up of groovy monads