more cleanup of variables