Add curly braces to if else & try catch statements, Move else and catch statements next to the right curly brace of the if and try block, Move comments to next line instead of at the end of the code block

GCP-10280

Reviewer: Daniel Jao