Removed a couple of unneeded tests
Normalized use of semicolons and fixed a couple of minor issues