Switch to yoda conditionals as well as using identical comparison operators
Fix whitespace