color refactor