First pass at reformatting complete