Order to modify the file & A little formatting issues.