sga-7 small refactoring +review CR-1023