Reorganized if Statement