Reformat
A little of cleanup