Code cleanup has begun. Removed some unnecessary code and changed some temporary variable names.