Fixing some comments and code formatting.