Fix formatting and indentation