Clean code and add color feature