Small refactorings done