minor last cleanup