ECOM-531 Updated style after review with Andy Waldrop