Neatening HW10

Making the conditionals more intuitive and "rubyish"