Clean up MLTK CA and fix a Bug

I've done some cleanup according to
some comments crab left me.
The MLTK CA is still not perfect
and need some testing.