Cleaned up some variable assignments.