Reorganize variable class