Refactor first and second play