faster N MCS plus clean ups
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>