Formatting cleanup, removed useless comments.