ActiveAE: some refactoring