Finish optional arguments and format some code blocks