little cleanup
merge