Reorganize values

[none]