Do not test repeatedly if variable is set
Whitespace cleanup