Adding refactoring in gfa interpreter?