removed duplicated return