[Refactor] Change conention for naming and binding event handlers + misc minor