Some indentation modifications