Reformat of code