grouid refactor