Improve the code quality of Frame.

4 jobs for improve-frame in 10 minutes and 6 seconds (queued for 2 seconds)