tidy up token storage comments