Refactor Color class with some improved conventions