further cleanup, reformat
updated AAB definition