Stripped out per-token image, renamed some things