merging some clean up