Minor refactoring
Improve colors