Migrate to Lens and other small cleanup

Please wait for travis to finish before merging this.