Simplify query and modify
Move getter and setter into lens functions