cleanup and finessing