small consistency tweak on the handlers

Signed-off-by: Bruno Gaspar <brunofgaspar1@gmail.com>