Cleaned up some var names.