cleaning up some details