Remove a few comments, beautify code.
Beautify, added some logs.