Small refactoring;
Micro optimizations.