Refactor Continued