Refactor BatchedCalls instantiation
Refactor dispatching
PEP8 courtesy of vim python-mode