manjsi refactoring