Cleanup line matching