Cleanup var declarations