Reorder variables
Move variable-dependents stuff to end of file