EHO-270 formatting & minor cleanup