@edvin I was uncertain about adding the suggestions to the PR but adding another PR just to "fix" the flow of another PR didn't seem logical to me.
A PR called refractor PR632 doesn't feel right to me and I don't know if it feels right for @r4zzz4k...
So a question for the next time: can I add comments like this to a PR and say "need improvement"? Or is the way to do this to add PRs called cleanup-PR632?
(it feels especially bad when they are just 2/3 changes)