KAFKA-1107 Follow up review cleanup comments