Description of problem:
This is bug relating to more of a code enhancement. There are two bugs
which talk about the actual issue:
Though the issue is fixed, there are quite a few methods which needs
to be refactored. Please check the comments on the below patches for
Version-Release number of selected component (if applicable):
Steps to Reproduce:
Not a focus right now!