FAE Update

Minor cosmetic changes and streamlining