Indentation fixes and formatting