Some more improvements to the previous commit