Follow up style changes with Gabriel's suggested changes