Refactor first pass completed; tests passing