Refactoring, commenting.
Refactoring, commenting.