Put catch on new line
Add fold markers to function snippets