cleanup and rearrange