Fix indentation and markup