Reorganize variables