Lens ALL the things!

Rework a lot of code for improved readability.