minor cleanup
merging