reindenting + minor manual color change update