Merge "Update formatting and docs"