Minor changes and code formatting.