Refactor Markdown

Second option for rendering in Markdown