minor style fixes
(cherry picked from commit 4445e1c7e5f171ab8fd8c3e06fe906c27a3a38b2)