Update to use Javie.EventDispatcher and fix some code inconsistency.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>