Refactoring of GEC calculation started