Additional comments and formatting