remove widows & improve calls to cation