Source code refactoring, merged functionalities typeDiv and typeMod