Minor tidy up of debug statements