organizing ops better, link cleanup