I'd scrap that unnecessary return