MIFOSX-1662 Code Refactoring