Got rid of unnecessary if statement