Reorganize a bit