Code clean up. Moved from HB_EVENT at root scope level to scope 
$watch('elfin.Id') listener for simpler initialisation process.