Removed markdown rules
Methods refactored and new features for token list