Prefer guard over conditional expression
Fix specs to prefer #is_a? over #kind_of?