Refactoring and clarification.