Formatting cleanup, comments