Whitespace changes. No functionality has been modified.
Remove redundant NULL check.
Fix control flow issues.