Refactor pitch creator

In this case, I think I want to leave it as is, since extracting it would mean that creating a pitch would re