MIFOSX-1662 Code Refactoring
Merge pull request #1169 from chandrikamohith/MIFOSX-1662

MIFOSX-1662 Code Refactoring