Improve markdown parser format