Nit: Could you add the space back after the if where you removed it throughout? And for new additions.