Code style changes
Whitespace and typo
Style and whitespace changes
Aesthetic changes
Clean up unused variables and fix variable typo