Use std::intrinsics::TypeId

Fix indentation + update comment