*mini refactoring