Indentation and formatting fixes