Clean up some of the source code formatting.
Fixed a missing semicolon from the last commit.
Removed a redundant if statement condition.

This is already checked in the if-statement before this one.
Remove yet another redundant if-statement check.

Yet again, this is checked in an outer-scope if-statement