refactoring around Color