Using arrow functions instead of |self = this| pattern

Change-Id: If50b968c56fd47498bbbd5ee004f8ea439cf7ad2