Remove some useless checks
Add spaces to create illusion that I actually did something