Some indentation improvements