Better if statement formatting