Little reformat
Tweaks