Refactor color