Minor update Color class
Minor refactor