Code format cleanup + add some debug print to track an issue for some users