unnecessary helpers removed, code commented