tad of refactoring