Fix style issues
Release 1.8.12