clear useless stuff & make a better coding style
fix conflict