Tidied up some chattiness