Modify comments and remove unnecessary codes