[AMLUtils] Cosmetic changes