3.18.2
======
* Fix classic style issues