Some cleanups

Forgot the spaces. Also interesting to see this style. Doing the comparison this way around is not necessary if you have a good static code analysis. ;-)