Small style related cleanup

Reordered import statements and variable declarations.
Removed an else clause.