some more extension method cleanup