Cleaning up formatting and comments.