refactor according review.
add gatewayid as logic. But Still been deviceid
Remove comment by Review finding

Signed-off-by: pachacutec <agustin.march@gmail.com>
Signed-off-by: pachacutec <agustin.march@gmail.com>