BE-9 further tidying