Remove useless debug for the next round of debugging
Minor comment formating fixes
Add useful debug log for next round of debugging