removed some else statements