SAMIDE-12: fix minor style/words issues