fix vault and compute reports, restructure, clean formatting

Change-Id: I7dd06096884ed7c2ac0c81cd5a6791f029724a51