Improved style.
Fixes #31