Refactored some color method names