Removed the parallel computation of X, M and Y
Changed the name of some constants
Simplified & clean
	Removed some unused constants.