Improve the code quality of Edge.

3 jobs for improve-edge in 6 minutes and 29 seconds (queued for 2 seconds)