Refactor pitch creator