-Remove some debug, add some comment