Tidy a few debug statements