cleaned up class token generation by adding variable names