Reformat of the code