Remove unused imports, put else statement after the right curly brace, move trailing comments to a new line, remove useless parentheses in if statement

GCP-10236

Reviewer: Crisjaira Villarino