refactor grande