color coding; cleanup