Refactor pitch creator

client_id?