More indentation adjustments -JH