Codesniff cleanup for countries model

JOINDIN-230