z71: cleanup, small changes here and there