began lunch refactor
removed unnecessary helpers