Merge "Update formatting"