Cleaned up token handling