LPS-50049 Refactor portal-impl pt.4
LPS-50049 Source formatting