Work on formatting including code blocks