More esformatter updates to align with current style guide