Formatting fixes, comments.