Removed some comma separated if statements