Updates

Minor updates to comments and formatting