improving... refactoring