Added color and improved output