Formatting/comment fixes