fix some formatting and indentation