Issue #1975028 by zterry95: code format cleanup