Refine token definitions

Purpose

Add more clarity to token definitions.