[feature/clean-up] Remove duplicated code from portal modules

B3P-CU
Merge pull request #143 from marc1706/feature/clean-up

[feature/clean-up] Remove duplicated code from portal modules