Little bit more cleanup and make the cm.mk better