removed unnecessary if satement