Refactor create freestyle