Simple refactoring with Wgrep

Simple refactoring with Wgrep, with help from Ag and iedit