Updating comments, formatting