Cleaned up duplicate variables