Renamed & cleaned up TokenController