Fix per review comments
Fix per review comments

kartotherian/kartotherian,kartotherian/kartotherian,nyurik/kartotherian,kartotherian/kartotherian,kartotherian/kartotherian,kartotherian/babel,nyurik/kartotherian,nyurik/kartotherian,nyurik/kartotherian