Changed color usage to class function