Swap was re-written and Indentations was fixed.