reformatting & minor additions