Begin Refactoring of Code