Use consistent % literal delimiters
Fix indentation, etc.