cleanup and indications for improvement