Corrected indentations and done all other changes