Inverted if statements, cleaned stuff up, etc