Reformatting, updated solver opts