A few style changes to the token