small Refactoring