Refactorings. Clean-ups.