Update style, some code changes.