Remove comments and debug code
Refine coding style