clean code,add hightlight