small code review tweaks
removed  in favor of event emitting