Second assignment got rid of some else statements