Tidied up some debug print statements