Reindent the codes and re-formatting