cleanup and rearrangement