Continue refactoring towards better clarity.