PEEK: Beautify bridging layers code >>> This commit will help merkmod with hover integration

Change-Id: I7868390c7779d12dd394a21b428ee417c9c98b97