Took out a useless if/else