Gl simplify refactor