Few more re-indentations done and differences added.