Cleaned up variable usage a bit.