Streamline av

As mentioned in https://github.com/OSU-Net/cyder/issues/624