indentation improvements