Make immutable, cleanup