Minor cleanup
Modified debug statments