Reformatting and updates