minor refactoring -- problem in previous commit fixed my renaming an event...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
more refactoring...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>