Improve the colors
Refactor