cleaning things up/merging