AESModel Implementation and other minor changes

Minor changes to previous code in order to be more consistent when
calling methods.