Add some debug output, remove unnecessary comments