grab ganji refactor