fix coding style and polish

Authored by cgilles on Feb 18 2020, 5:39 AM.