Changes to comments and formatting