Some more improvements after feedback from @mdenburger