806: Improve code style