continue the same refactoring...