some tweaks
reformat