minor cleaning
merging