Simplify random token generation

Fixed #17.