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

This reverts commit 96dde6a096f64d0d991968ff8a1a993a6af99e89.

Change-Id: I58ac6694e4b7e0b63cec82d11ad8e44b2b6e4e90