Fixing over indentation - Edge case with comma