Formatting and indentation fixes