Refactoring 070714-2