Fix typo, remove unnecessary helpers