removed unused imports
If Stmts Must Use Braces
var renamed