Applied minor refactorings