rearrange / cleanup