UP-4524 Makes if statement a bit cleaner