Further cleanup, increased use of lenses