Gamma refactoring