Implements refactorings.
Implements refactorings.

jeremykendall/flaming-archer,jeremykendall/flaming-archer,jeremykendall/flaming-archer,jeremykendall/flaming-archer,jeremykendall/flaming-archer,jeremykendall/flaming-archer