Refactoring Continues.