Minor Adjustments to IF/ELSE