Chore: more code refactoring

2 jobs for 4.3.26 in 3 minutes and 16 seconds (queued for 1 second)
latest