rearrange
cleaning up mess