Refactor events.
Added guard for target cell in event move.