Use kind_of? instead of class.include? and rearrange stuff