Merge "Fix-up coding style"