Inline variable refactoring