Refactor GU