Minor cleanup in class file and documentation of m2