Cleanup variables code