simplified a few things