Improve markdown parser format 2