Betsy Haibel

Refactoring