indentation fix and removed not necessary sets