Formatting cleanup of package.xml
Clean up CMake.