Added formatting script and updated formatting