zachs first refactor