reorganize a bit