minor cleanup
merge