a little bit of cleanup
merging