Separate out token preparation step

Token prep was occurring within an unrelated transform. This step is now
separated out into its own transform