Fix compiler error with cv-qualifiers on member function pointers
Switch member function pointer and string pair in initialisation
Format changes