did some stuffs
removed excess