some more code refactor

:Release Notes:

:Detailed Notes:

:Testing Performed:

:QA Notes:

:Issues Addressed:
[GF-9999] Summary