minor Refactoring