Fix up formatting