Remove duplicate attributes

Also fix indentation