Added a de-factor color style; removed unused methods