Refactor Alf