More code style fixed.