Fix some coding style and missing bonzo