Code cleanup, ensured there is curly braces for if/else statements

GCP-10279

Reviewer: Chezka Arevalo