removed unnecessary if statement