Get rid of some extraneous elses