Comments and cleanup for MA