Style changes from oval work

Formatting clean-up to align with project style.