Improve the code quality of Handler and Handle.

3 jobs for improve-handler in 6 minutes and 22 seconds (queued for 3 seconds)