Update some comments and move definitions to within the class.