Code style fixes
(cherry picked from commit 6eb565d)