Micro refactoring.