This refactoring is fine.