cleaned up some working