Refactor Avi2