cleaning up some more details