Refactoring of overwritten Ga-Block