refactor, GA code