some polish
merge