Format call in enumerate_handlers was missing a parameter

Removed some now reduntant variables too.