Refactoring [g]