Code gardening: add whitespace for style consistency
Restructure code to simplify program flow.

This way we don't have an uninitialized local variable "for a little while". We always would assign a value to it in the if-else block below, but it seems like a good practice to avoid uninitialized variables in general, in case the code around it changes.