Reorganize vars