Refactoring per Thomas Burleson's input - Phase 1