Remove leak and reorganize