Indentation/formatting cleanup