handler: code review changes