Refactor of the first 30 variables in GC_state