removed non-need else condition