remote debug code

modify some comment and debug code for the sake of simplicity