Formatting fixes
Use system expat