Cleaned up some lens use