lens 3 -> 4 + minor file refactoring
Minor lens helpers