Refactorin'
Remove some unneeded tests
Judicious use of loops.
Typo