minor last min cleanup