Refactoring with Marginal Gains