[TASK] cleanup Dispatcher (whitespaces mostly)
[TASK] Dispatcher code cleanup
[TASK] code cleanup
[TASK] cleanup and refactor ExtensionApiService