Some further cleanup and resposivene-ness