reversed position on the token types. The simplification was possibly unnecessary, so I didn't want to enact major changes at this point