Cleanup of formatting.