Small refactorings done.