Made more use of lenses that I just learned about.
Now the constants are separated from the callbacks.