remove useless code
adjust a little highlight
clean code