Cleanup Formatting

Cleanup formatting to correctly read lists and limit line length to 80
characters.