Progress on fixing indentation