Unneccesary else statements removed.