[MAGEMEP-131] Code now completely clean and improved