Made the color coding similar to grep
A few simplifications