Refactoring

Refactoring to cleanup target discovery
New Quick Fix action for creating new Guid

New Quick Fix action for creating new Guid to replace the duplicate guid