Tighten coding style and fix lint issues.