Refactored Bold/Italic markups