Wip refactor lenses and helpers

Should be no functional changes.