Some reformatting