Refactoring As Suggested By Dan