minore refactoring