Use idiomatic conditionals
Remove intermediate variable
Style code as pleases MJ