Reformatted slightly