More code cleanup - if's