Reified: some cleanup + comments