reformatting & small fixes