i) Implementation of MOD variable naming from module.mk file name
ii) commenting and removal of debug code