Add compatibility for m2e and a comment cleanup