Refactor and Talk Test