Continued Refactoring...