Style tweaks
[WIP] Start working on dispatcher