Refactor: decrease code complexity of M4A Class