VID-438 Combine if statements