Fix style and bug