More formatting

and more to come..