Update style and bug fix.