Got rid of else statements