Use Scalaz Lenses instead of a custom implementation
Style fixes