Reformatting and small additions