Clean up and code formatting.