Fix intendation n remove unneeded piece of code