Improve class style guide