changed case..when statements

Changed it so that instead of || it uses , because I just asked on Stack Overflow and that is the proper syntax for case..when statements.