if/else statement taken out

if/else statement taken out