Simplify overcomplicated and redundant conditional expressions

Sorry this is late, I ended up just going to sleep when I got home :zzz: 

Signed-off-by: Cruz Julian Bishop <cruz@techern.com>