Complete indentation fixes