Fixed unnecessary || statments