Fix formatting and indentation to make @mavlyutov happy