cleaning up and making more like the other ones