Refactor Color