Reorganize variable delcarations