Did some reformatting