MAINT: address review comments of Josef.