Add "Thanks to JCMM", clean-up