Refactor aes ni