refactor: addressing review comments

4 jobs for issue/responsive-again in 4 minutes and 40 seconds (queued for 3 seconds)