Some updates to comments and formatting