"cleanup and comments"