Code cleanup (PEP-8, etc.)
Fix critical bug: incorrect reference to METHOD_MAP