Change guid format of resonator
Change:
Guid format of resonator change to following,
[portal guid]-resonator-[slot]

Some code cleanup