Remove useless information, refine code