Jack Christensen

Refactoring