Code style

Fixes #4172