remove some useless code and add color class