Merge "Coding style cleanup"