Refactoring. Attempt to implement address