clean up and rearrange things