Basic reformat the code