1. Small refactoring.