Minor refactoring to follow the lens library.