JZ: Fix style errors