Correct formatting of some code blocks
Manual merge. Fixes #3