Update some comments and formatting