evita: general cleanup and tweaks

Change-Id: Iaa858c922a780a65e5502bc9d5141677c7b37a5a