Smaller refactorings

Hey Alex,
rather than doing the review as commit comments I played around with the current code myself a bit and would propose these smaller changes.
I think with these things I think we can close the main PR and move on...
WDYT?