attempt to clean up some