Mini refactor of teaches helper...