[Realtime] Refactor things.
Merge pull request #1038 from akbargumbira/develop

[Realtime] Refactor things.