some cosmetic changes in genericAES